Made stuff less resolution dependent