smaller, cleaner, less buggy