merging mark's changes