Frontend and minor change