updated controller and added billing + shipping info on cc