Further responsive functions

Work for 320.