[WIP] need to merge some fix