add performance metrics, update controller
merge updates