Rewrite and tips added