alot of modification in app