added 9.2 stuff