Move the optional stuff to the right place