Added option to stop execution at --