all changes from joel