revert some changes and update basic app