Changed all references to active to boolean