Additional changes, add more functionality.