Moved stuff around to prevent errors.