Changed to external method calls