Updates for initial starting point
merge from head