Add back in the access checks and GLE check