Update for H&FJ :disappointed_relieved: