fermin's changes II