Switched to custom display code