second commit: some changes