Refactored yo calls