An apparatus and method for heating water using a tank or a tankless water heater with improved electronic control. The improved electronic control may include voice and Wi-Fi control of the water heater to allow for remote control of the water heater including through a remote server or cloud server.