Updated for input areas.