final commit before going live. linda mah updates