move to common class
add facility class
temp