added exluding, removed logging