updated to work with multiple rows...