need to change the comments here to remove context properties which don't exist anymore.