modify to remove warnings