JM's first changes