More options added to help with debugging