reformated and changed