moved variables to shell context