Added part of new select system