Improved FE forms