Calvin's changes