Some changes
Merge branch 'TCC' of https://github.com/GreatDevelopers/ofau into TCC