OC re-design for @milkytea