pulling brian's changes
merged