add filials and few small changes