Adjusted geometry

based on first prototype