added stuff on the front-end stuff