added notification for new code
added parser support for "when"