Update framework; remove question