hopefully fixed front end