FIX join fight error
ADD preload and optimisations