Tony's improvements