Replaced Vector with ArrayList