I think we should make this a DEBUG