First version with selector working correctly.