incorporate front end better