new stylez
merge fix thingy