second commit

more changes..