modified some context stuff