committing version from sunday 5/5/2013