Ricardo's modifications.