added notes for next version (FIXME)