yoloroy

Refactor twice and add the feature once

• 
• 
•