Changed to reflect googz code