Update to r60 (forgot to add files)