more context security changes