A lot of changes/App revised