New abstract oh nej daniel
Fix merge conflict