changed conditions
changed conditions, added pause components