implemented millie minus conditional refactoring