moved optional elements to correct place