Update advance mechanism

Will validate later