adding conditions