Changes/hacks for face to face