Work more on debugging