Provider revision work 02

Still some problems exist
Provider revision work 03

Provider revision work 03
Provider revision work 04 - fix bookmark

Provider revision work 04 - fix bookmark
Provider revision work 05 - complete(maybe..)

Provider revision work 05 - complete(maybe..)