Combined the changes in both mine and Roberto's commits