Moved outside of if