changed all kinds of stuff
new style 2014