continue rewriting for the app