Modified for front end display