Trying to improve scroll handling