Sorted out scaling to put everything in the right place