BIG Update - Slow performance fixed

Slow performance fixed, Registration updated