making component-friendly (very quick, long-term solution to come later)