move more things to common