finished for ffx #25