advance + fix on the doc