Updating with most current functionality.