squarooticus latest changes from Renan