minor adjustments and new oad