Rearrange pull list
Fix futures