minor fix
admin changes
merge fix