Legacy - fix me.