fw and ecda elements added