With Charlie's fixes