review with vadim, files now in FOM Bundle