Some changes un str fns