Removed extra cruft, shuffled contacts first