More changes to this shiz