Merged a bit of frontend