Added extra functionality.