Need to add if for second line and test