checkout and related items changes