update

merging most recent changes