some changes including checkout