WIP - Reducing ping time