Updated wtih printf changes