added backwards compatibility code