Improved variable setting drastically