Adding Tony's changes.