Intergerated changes done by Hoa and team with Winshuttle Engineering team