Added debugging code for s