added waimea support