Tom required changes (2)