enhance the conditionals
change version for new dev