Switched SelectWithNext To include previous