Started fixing selection strategies