Redid objects layer in hopes of warp fixes