changed the tax to 8
Merge branches 'wreck' and 'master'