Updating for new object loading (EXPERIMENTAL)