merging Dan's changes