some changes on confirmation code