Better

Files much smaller