Finalized changes for initial release