merge sean's changes