added support for if/in