Now with more debug messages