Updated changes for a final release