More modifications for initial release