make those optional