refactor moves that look to future