change input-parsing strategy as discussed