Final updates fro client review site