Slapdash alterations

Slapdash alterations