committing further FE changes