backend & ui changes