added some improvment for content: