Updated utility