Collect static revised