changes to object loading