Adding number handling
Missing new line