Modified so it's not doing that check every single time