updated to Bundle standards