Improved frontend