Working initial case +  prints removed