removed old Flock; moved flock to Flock