More changes on 'old' rodin 2.8 CG branch for Asieh's work