Craig's changes