Further improvments to multi stable system.