Removed #text bundle and replaced with actual variables