Fixed Xinlu's null pointer exception, but only one result is being returned, so there must be more things that she broke.