More hacky stuff
More changes
More code cleanup