Some debug prints added