something is wrong with the last 2 commits work form here