Semi-working
Enforced completion
Merged changes