Put opts back in