changes to fix FE