updated and added new ones