Improve fe design