refactored
isn't finished
Merge remote-tracking branch 'origin/doc' into doc