8.2 style updates