bashing it up
new changes