changes for backward compatibility