Committed the changes recomended over hangout