Added option for debug