Applied code changes to fresh clone.