first commit, solved