Same thing here, returning a struct would make this easier.