Start rewrite take-2