Finished changes of last commit, build fixed.