added doc positioning - need to merge with other branch!