Added more logs and leaves