small changes to get exactly like NFM