more refactoring, different smoke trails now