Make changes as per Spencer's suggestions