fixme notes added