Changed the way that resolutions are applied

prep work