pulling Luke's changes
merged