fixed everything to use the good context structures