optimized fixed all passes