Fixing non continous axis, and somehow -8 rows of code :)