Updated to include 12 and 12v