Added fw case