Hard-coded values taken out for swiped decisions

Hard-coded values taken out for swiped decisions