changes by other guy
merged code