Tom's changes