more changes for smoother frontend