Modified for faster app loading