Merging new frontend