clean up according to yongari@, not finished yet