commit after lotof changes and working fine