More debug output added