Rewrite notices and update of sheets, migrate & tests