base on molokai, add my change