Updates and changed format. JEG