More work on front-end