added class true/false for complete
Fixed merge conflicts