Apply @fxn review