added front end stuff