edit more module by Chiu