improved front-end