Fix ahome and add onComplete