re did parts of 2
more changes