Moved these lines up from above