progress
Improvements
Improved conditionals