last commit before adding more flexible resolution options