Updates to fron-end