Improved saving, same time saved for scrolling and non scrolling