Fix to remove a portion of hard code
Add console-behaiviour