updated for compatibility