Just about done
made some changes