Resolve some bug and change system exchange