last commit, code fixed