That looks very good Rik, however, I'm not sure where the original shapes are ...