mergin my stuff and overriding code that doesnt work (:
merged