active states check added...