Made the changes we discussed on Friday

Made the changes we discussed on Friday