added exception for waive charge and interest