Introduced stepTracker and eliminated selectedProduct