changed refresh time to 3
Merge branch 'development'