Second commit

some changes