fix: issues on master
fix: issues in master logic
fix: start stop condition generator behavior
feat: add start, stop condition generator