Added function for only one organization