Updates

- Change input check logic
- Switch to full step mode