re-add static components for now