Updates to help debug