Cleaned up framework/