version 1.2

I edited this up a bit