removed the contexct class and modified contextExecution class