removing the forcing into context code