More debugging

More to add