Changed to object oriented