Some resolution but not perfect yet