added TODO
update on analysis