More progress on front-end