Tag Sleep improvement