Should have committed some of these changes ages ago