Merge "Modify frontend"