updated with latest from Dana