Slight change to improve OOP