Whoops forgot about narrow. Actually managed to move more stuff to both formats