Redo fully working improvement