small changes in my functions