More work on OPT section