Start of rewrite with click