Structure ready, needs optimization