front-end code merged with new structure