fixed some code with equipment