some work on frontend