New hybrid buses are on their way