Merging changes from working session with Kevin.