Update to work nicely with text inputs