revert to b630c497
#51 In OOP manner