renamed 'entity' to 'object' because it make more sense