Adding legacy code in for now