More work, safe to use again I think...