various changes to works at tier3