Incoprorated feedback from katy and matt.