Replacted Vector with ArrayList.
Small changes.