added class variables
merged code