Further implementation of proper server sync - Jumping is buggy