added some stuff for falcon and panda