[00000m] First Set of changes