v6
v7
v8
v9

code clean-up time!!