Added legacy code work