More changes by Thales Vieira