main ctrller fixed with async functionality
small merge