front end fixes working