Improved variables & parameters