changed frontend to speed up