Improved two player functionality