added check for "active"