Change to use select for everything