Major changes... yet again. But this time, it is cleaner.