Fixed and refactored variable system