working on resolution