Changed to pulling inputs