Condition added for input check. WIP : one more to be added.