Updated molokai scheme