Adding SquareRoot and reorganizing a bit