third commit: some changes