Changed sets to lists