Moved around the area calculations