added some stuff from the review