Major work: ticket:8 OPD stuff