merging dan’s changes