modified some frontend