Using objects and classes fixes