Updating Repo with new changes from cmalai

Updating Repo with new changes from cmalai