got rid of arraylists