Some modification on console