some temporary changes in app-main