Updated functionality.