preliminary changes for final release