Final changes related to checkout