Integration of Ben's new resolution stuff
Changed name to be inline with AS version