tested, context recognition seems to work nicely now