added auto_compute functionality