Additional changes, and updates