Updated files with latest non functional master

automatic scroll