Replaced all SHIFTs with OBJECT_SHIFT