Progress on fixing scroll