Starts to change checkout logic