Added scales plotting and seems working