Updated Branch with latest functional master

Auto Scolling Test!!