Added changes to new checkout