More of Javi's proposals. Sec. 4