Trimmed, minimal safe version complete