removed other hardcoded vars