Added 6fire specific code