HCOLL 5 Fully merged both my and Peter's latest changes