optional elements moved to correct spot