more changes related to print statements