Tom - first code commit
Tom - removing some puts