Move the code a bit in the right place