More changes to console version