modified app 2