Should now work with or without proxy variables