Make it work in the new, temporary location and make it look slightly tidier