second commit, fix with errors