update with Matt's suggestions
remove answers