initial scrubbed commit