last version before we introduce locomotive