Move integration towards the end