added website & added active check