Commit 10/17/12 Adam