Note down rewrite and future plans