jied83 changes