Bug fix & change the model to the pure geometry objects