added multi-select (and probably broke something else)