Dev

merging Ben's changes