remove TODO, make it work now