JR1047 added debugged statements