merge
added progressa bar