In view of the latest changes to peekaboo