Working on new checkout changes