Enhance by step API