added current context checks