Moving things around, updates