revision2
still finding glitches