adding support for "none" conditional