redo from orginal-52