Edits to finalize Version 3.30