Updated: More changes