Now this code is OOP