Using only as many addresses as we need.
fixed some merging issues and now you may do the inline thing which doesnt work