modified app.go