updates
merge Adam's changes