Changed to call the correct function