Updated for compatibility with current functionality