Made input more flexible