Moved up another if