Hopefully adjusting for pivot