fix naming of handler data
add variables to handler data
remove dummy variable