Java6 compatibility changes
Playing more w the bitset idea