Pre-load friends
Merge branch 'shao'