More tweaking for Equipment