update content to fix issue 2 & 3