Simplified and fixed completion events