Added functionality that was accidentally reverted.