Edit to my version. With Doc