took out some ids and added some color