Shift code to more reliable location