Vast improvement on front end