Make balder-app changes