changes to support multi fires