moved timestamps and refreshall
Merge branch 'sammy2'