Added option for proper run