rewrite end-of-this completely.