#192 fixed bug and also refactored other add conditional method