Separated 6fire specific code from universal code