mike changes
merged code