Added basic resolution code