Updated with swag