adjusting code to new iinic