Just got this as a replacement for my late '90s 'Ray. Different design. Can I presume pup wires go where B&W marked by red arrow and that battery will now hook up to lugs on jack socket? Thx in advance.