2nd commit after make over