final (I hope) commit