changes in logic based on dev test and review