Updated to include both 12 and 12v options