added 96 support