20 min of merging and findinf mistakes and stuff.......     /(-_-)\