Move stuff around for safe checks