Changed to non-state variable