moving redundant stuff to common