Update to Switch statment