Still fixing the string split