Straight and pump extensions

Title