More changes to match porject direction