adding conditions support