big upgrade for future apps and gui