Further overhaul -- reached a little into weak equivalences