Changed to JComboBox