minor changes to new context added