add metrics
make system atom, instead of individual