performance
refactor admin and performance
merge