fixing initiator performance problem
working on context