Turned some barriers into ifs and things still work as far as I can tell