everything in the correct place now