Updated files from hyak