Changed ArrayList to Set