third commit with some changes.