Updating to handle listen command too