critical changes to backend