several changes for FR