Making fw optional