more changes to support the initial release