fixing methods to work with new objects