Updated TODO: tested with Deep Dark