update to input parsing