Updated - remove warnings