* Reworked the internals to improve the app performance