renamed to draft3, started final changes