account rewrite continued