new version with ArrayList and comboBox