Second commit

more changes