Changes

Made during discussion with Matthew