added class variables and logging
merge fix