Adjustments to core app