added active check