readded Shapes and modifications to SolarSystem