merging new speeder logic from awp