still works. redid previous work.