[MOD] some needed changes