added in random generators, and took out old ones
added in random generators, and took out old ones