changes to comply with aug scroll branch