WIP -- fixing the resolution issue