Added calls to Samaan functions