Updated for Friends 1.6