Updated a resolution
Refactored resolution based on the latest changes