Adjusted the location of code