moved inline functions to header
regerenated industrial queries for testing purposes