performance
refactor admin and performance