Just changing some return types to void