work on todo + remove old method