added support for more condition functions
Catch up on changes