actually making it optional now