Simplified quite a few things...