Tested using the new input class