Replaced external to internal calls