Changed print commands. IMPORTANT:
Dan added static logic that was not included into commit!