new TODO
fixed typos, added counter incrementation