Starting to fix the auto generation of shapes