Better seperation of content