old ones and added new ones