Temporary quick & dirty modifications...to clean & test