Commit with Sean's changes