Final edit

ok now