Execution time map OK
Miscellaneous Changes