update: interactive + ondemand to mako baseline