[#72776364] changes to accommodate bike format