Updates to remove println