Updated opd validation catching
updated makeup script