Added "safe-units" Partial