Replacement selection, new implementation, still not working correctly ...