Updated to remove warnings with suppressions