Same as last commit, but with updated sources