changed conditions not to explicitly ask for true