made everything working to handover