Equipment Revamp done! Close #37