First Commit changes by Daniel Liem