roughly working, back to original state