Notes to fix the bugs