recent changes from jadmin
Changes from jadmin