merging with chels changes