updated to give back a custom resultSet