improved the front-end