Timeline update
Updates
Merge branch 'beta'