Updates for analysis
Visualisation better