Improved PublicApp