Improve scroll: shield