condition on children comment
bug fixes