Updated to remove warnings