more notes
better logic, just in case there is news