Cleaned up main assembly