Improved front-end