Changes to make console work