More work to make things stable