Making changes as per what Sam recommended