Moved for more logic