A few changes
Moved sq3