UPDATE FOR 9.2 UPDATE