Redrawing/redesigning some ooooooold (8 years at least) ocs