Working on the precent bar
Merge branch 'test' into dev