updated for universal?