more updates to handle uncles