added generated list and more