updated toDO
moved methods