More Changes on Allocation
Merge branch 'master' of https://github.com/ttunduny/HCMP-1