Made the changes we discussed on Friday