Execution Part Fix