Added some trace statements for debugging