Changes to get rid of some prints