Add offline fire transfer
Fix bug