some of Sean's changes