DONE
(now really done)
more changes