Minor changes to the advance method