Added Simone + Upgrade for H&FJ