Final changes for the YRS NYC guys