Updated to latest feedback from FIG ML