Small changes to work towards the visualization