Adjusted output for new layout