Incorporate Rick's improvements.