Repacked for validation