Next rewrites (1/16)

Next rewrites