modified to use omake