Changes you made on my branch to fix resolution path issues