Addressing comments & implementing feedback