improve handling of equipment images