changes to make STII work right