Adding updates from discussion